From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 23 Apr 2013 20:43:51 +0000 (-0400)
Subject: status: Remove settings actions
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3902
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2cd41773ba4cf6be4d7ec07e636d3b1d17b1817b;p=gnome-shell.git

status: Remove settings actions

These aren't used in the new system status designs.

This is a part of the new system status design, see
https://wiki.gnome.org/GnomeShell/Design/Guidelines/SystemStatus/
for design details.

https://bugzilla.gnome.org/show_bug.cgi?id=704368
---

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 479a15a70..e6be115c8 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -68,9 +68,6 @@ const ATIndicator = new Lang.Class({
         let mouseKeys = this._buildItem(_("Mouse Keys"), A11Y_SCHEMA, KEY_MOUSE_KEYS_ENABLED);
         this.menu.addMenuItem(mouseKeys);
 
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Universal Access Settings"), 'gnome-universal-access-panel.desktop');
-
         this._syncMenuVisibility();
     },
 
diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
index bcc853b3f..aa7505c0f 100644
--- a/js/ui/status/bluetooth.js
+++ b/js/ui/status/bluetooth.js
@@ -81,8 +81,6 @@ const Indicator = new Lang.Class({
         this._applet.connect('notify::show-full-menu', Lang.bind(this, this._updateFullMenu));
         this._updateFullMenu();
 
-        this.menu.addSettingsAction(_("Bluetooth Settings"), 'gnome-bluetooth-panel.desktop');
-
         this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest));
         this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest));
         this._applet.connect('auth-request', Lang.bind(this, this._authRequest));
@@ -241,22 +239,6 @@ const Indicator = new Lang.Class({
                 this._applet.send_to_address(device.bdaddr, device.alias);
             }));
         }
-
-        switch (device.type) {
-        case GnomeBluetoothApplet.Type.KEYBOARD:
-            item.menu.addSettingsAction(_("Keyboard Settings"), 'gnome-keyboard-panel.desktop');
-            break;
-        case GnomeBluetoothApplet.Type.MOUSE:
-            item.menu.addSettingsAction(_("Mouse Settings"), 'gnome-mouse-panel.desktop');
-            break;
-        case GnomeBluetoothApplet.Type.HEADSET:
-        case GnomeBluetoothApplet.Type.HEADPHONES:
-        case GnomeBluetoothApplet.Type.OTHER_AUDIO:
-            item.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
-            break;
-        default:
-            break;
-        }
     },
 
     _updateFullMenu: function() {
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 3ca7f8fc1..e5eef5fd8 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -398,8 +398,6 @@ const InputSourceIndicator = new Lang.Class({
         Main.sessionMode.connect('updated', Lang.bind(this, this._sessionUpdated));
         this._sessionUpdated();
 
-        this.menu.addSettingsAction(_("Region & Language Settings"), 'gnome-region-panel.desktop');
-
         this._sourcesPerWindow = false;
         this._focusWindowNotifyId = 0;
         this._overviewShowingId = 0;
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 6cc9055ba..221863bc7 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1518,8 +1518,6 @@ const NMApplet = new Lang.Class({
         this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
         this._vpnSection.connect('icon-changed', Lang.bind(this, this._updateIcon));
         this.menu.addMenuItem(this._vpnSection.section);
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
 
         this._readConnections();
         this._readDevices();
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index c88700a2c..22400a38c 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -76,9 +76,6 @@ const Indicator = new Lang.Class({
 
         this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
         this._otherDevicePosition = 2;
-
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Power Settings"), 'gnome-power-panel.desktop');
     },
 
     _readPrimaryDevice: function() {
diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index ce5f4fdcd..e83fd9f74 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -309,9 +309,6 @@ const Indicator = new Lang.Class({
 
         this.menu.addMenuItem(this._volumeMenu);
 
-        this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.menu.addSettingsAction(_("Sound Settings"), 'gnome-sound-panel.desktop');
-
         this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent));
     },